Edit button on user view is working, code improvements are needed