Bugfixes and first version of grid