updated layout, not finished