Small UI changes. Buttons and checkbox in one row