Refactor of GridInputView and other tweaks

See commit messages for more detail…