Better grid
Control tweaks