Started Improving layout handling