Better routing and use of partial views
wip