UI: Highlighted active entry and cleaned up navigation list