wip make layout match wireframes