made heavy changes to the layout