Another step closer to the new mockup