Some changes

Some changes in edit text etc