Fixed spacing of headers, started refactoring towards using more u-classes