Added annotations to client models
Added annotations to client views
Fixed some bugs