Updated structure to use pretty links and got rid of extra pages that weren't needed