Refactor pages and add clearer menu / highlights