Reorganize main panel layout