Site Page Refactored - Part 1