some css and templates improvments