restructure views layout for clarity