Some more cleaning up and reorganizing of css blocks and functions; this is a backup commit -- do NOT clone this