re-organize layout and view content and markup