CSS & main template changes