Resolving auto-layout issues

- Resolving auto-layout issues