More styles applied and templates are simpler
Hand-fixed a merge