added toolbar, fixed mask misplacement bug, fixed bric removing bug