Second rebase attempt
Updated view content
Added in more routes