Fixed Block layout issues and missing commit elements from last time