Revised the layout