#386 redefining the IA for the pages to ensure they are consistent and also fixing up the landing pages