Wireframe and mockup updated

Final cut.