Started to clean up some more templates and introduce partials.