Apply new template, refactor variables, improve layout, update some text