Improving the general layout