UI-2462 : update the layout for Watch form