fixed pre & post op textfields
merge