changed some of the layout