Some tpl and css changes