Starting to fix the layout