added new nav and rearranged tons of code