Added form content to edit_profile
Resolved merge conflicts on style.css