Some more cleanup/prettifying and css work