Incorporated theme and overall layout change