Updated models and view

changed fields to not yet defined
work on client.views