refactor sub-nav and improve result entries