Move content out to the php files, restructure the pages a tad