cleaned up the layout