cleaning up the layout