Add some template and css fixes