Some more changes in layout.