Reformatted the layout with table