Overhaul look of everything, should be cleaner