Improving overall layout