Improved auto layout behaviour