Added some elements to mockup