CSS and Template updates