use improved grid implementation throughout app