added client card views/model, clean up