Changed mockup according to non-functional specifications
Added missing images to last commit (mockup changes)