Improving layout and shit