Updates: statements after if or else, removed Grid.Column attributes, white-space was deleted. It's ready for merge.