removed unused stuff
modified views that is dependent of model change
Did some buggfixing within the model
removed old update method