Cleaning up 'active' menu functionality