Css fixs
Templates changes
Fixes main classes