#4 Make grid less clunky