Draft: Turned the tray tools into a toolbar
Draft: Fixed radius and offset numeric values - fixes #1530