Adding a base template, tweaks to the main view