layout and stlying updates