bug fixes on toolbar