started fixing toolbar bug
solved merge confilcts