#3437 Separate state from grid module + tweak base grid style