Non editable field

Misc changes