Changes to views and rewriting methodes
Useless code deleted