Refactored page structure

RED team