Complete revamp of toolbar/menu philosophy