[REFACTOR] minor style changes, update combo_nav