Style overhaul
Make small layout changes
Remove unused styles