Fixed auto layout issues