fix grid / minor changes