rework navigation
minor cleanup