Workbench and menu improvments (not working yet)