Fixed toggling and moved button to right of toolbar