Further work on toolbar