added some layout and mockup