Fix #26 (again). Also, improve space management between panels