Improved button bar Fix #295