Tidied the layout a bit.