Re-worked all pages