Redesigned most of the pages