Making the auto layout situation better