Issue #16: Fix container layout form settings