Improving the layout (not finished yet)