Refactored currentSub for topbar