Changed main view according to mockup