Modified toolbar commands to work properly.