working on the mockup again