Rework main template and css