Make the count page the landing page

Removes the artificial landing page so you land straight in to counting without the distraction. Made minor changes to template names and order to rationalise with new functionality.