Unify toolbar logic and display more consistently