Minor updates to form and grid