Use checkmark, update positioning and disabling