More formatting (Day 2)

Better aesthics and layout