Reorganized main page structure