More styling, better template structure