fixing up the layout