adds edit button to user page
form for editing displays
fixed account page
fixed conflict