! cleanup the layout a bit