Drafted new mockup