Fixes for layout system
ixed block edit