More CSS and Template updates!