make UI layout a bit more logical