Basics of layout changes done.