Rewrite using mvc, plus widget stuff and homepage form