Minor misc. changes
Updated edit user functionality