Adding password verification and add some changes in UI part