Completed the wireframe