Some general cleanup and css updates