Tweak styling and rename templates
Fresh build