Fix corner radius clicking
Fix toolbar (moving tree buttons to toolbar + other (minor) fixes)