some changes to the layout!