Fixed grid selectors

And various fixes