Added more elements to design
More changes