Major restructure of the views and route handling