Issue #11 : Further modifications to grid layout code.