Updated base template and CSS