made some changes to the layout and the color