Made some changes to the layout