css and template improvements