Layout Result in EditProfile

made some templating in the function EditProfile
Merge EditProfile with master