Make grid available as extends and remove the need for presentational ma...

...rkup