Tidied up the layout slightly