added firstname and lastname and changed the button positions
Resolved conflicts while merging Forget_password branch into development