Fixed button issue and finished edit user page

I got buttons to be side by side and hopefully there shouldn't be any merge conflict