Do auto-layout if annotations are not there
Fix for modifiers