A few changes in the toggle button and edit text