Bugfixes GridLayout