Switched to using completely custom grid