Tinkered with toolbar and menu