going to fix some of the page and link layouts