add adjustments for spinbuttons

Change-Id: I11e8ce8fcbf468797b08a1a3101030fd07397c98