Play around with improving the layout a bit