Moved grid to modal and cleaned up a couple newlines.