MAJOR overhaul of pages