update toolbar and button control
fix conflicts