updated layout, working on functionality