Rearranged pages to eliminate dropdown in navbar