Updated the following files to fixed the design issues