Removed unused views
Screens layout
Some fixes