Tidied up grid usage and element spacing