menu and set-up template section properly
tidy template, models etc