Cancel Buttons added, text field views improved