add nav, cleanup stuff