Fixed CSS and a bit of housecleaning