Migrated away from using GridLayout as backing layout