[REGEDIT] Improve the layout of controls (#967)