completing v2-mockup skeleton