6th commit,toolbar acting up - hacked but it's not truly proper