PLAT-1104 add required chars + layout changes to avoid cut btn