Fix auto layout on main screen
Merge