Refactor views, add a menu to all pages