Refactored Main Page