-> Updated Views and some tweeks in the models