some fixes to views
Fixes to views and layouts