update some views and strating work on profil
Merging with master
Residual files from merge with master