improved the layout a bit