Improve the layout a bit and also improve the output