Ui dev - field related issues resolved