Refactored main pages