I think that you should get read of the horizontal bars and instead make every little type of past a sub-heading.
