Rename sections and reorganise navigation