Fix #7238 - remove clutter and change layout of interface