Add missing sidebar layout
fix reversed deep merge operator.