Cleaned up context menu nav groups