Issue 42 - Updates for centralizing and refactor menu highlighting.