updated layout, working on accessing data