Chg Layout unification
Enh Views and CSS refactor