Design and Functionality changes