Tidied up the look and feel