SmartDevice commit 23/10 - GridLayout