Refined the layout just a littl