css and some templates update