Updated routes and changed layout