Added edit funcitonality to client and user  - forms not ready yet and
entities still not attached