Grid Decoration Layout Fixes