Fix grid contents a bit, update theme demo image