change the szl label to textfield
change the ELBOW_ROOM constant to be appriopriate for smaller icons
Merge code