Misc CSS & template improvements