Some tweaks to main template.
More abstractions in index template