Use GridSelect for everything
Adjust whitespace