Button position at toolbar wasnt being preserved, added ToolBarID option, and better click handling.