Issue #11: Tidied up grid layout further