Lts of cleanups. Added routing for most pages needed.