Updated layout of toolbar controls