Added data and modified the layout