Style, layout, and repositioning

Looks better
These comments should be removed, require isn't needed with @import stuff