Grid Updated, Problems with Modal

Signed-off-by: Aris Blevins <aris@goteama.com>