Further grid improvements
Menu bar improvements