Style, layout, and repositioning

Looks better
eh formatting