Reorganized main view