Added GridForm, did some refactoring