Clean up BaseGrid a little
Use auto more places