Minor template and css fixes