Changes to made GUI like mockup