cleanup, navigation added