Starting to implement a real toolbar (unified on OSX)