Tidied up the layout