readding navigation, addressing issue 20
cleanup..