Implemented the editing in the same user template

Half done, ot complete yet
Completed the edit account functionality