Some template and css improvements