lots of clean up and nav organization