Tidied up the layout a little