Reorganize main view