cleanup
navbar updates