Additional changes for mockup layout