add more css and template fixes