little bit of layout changes