More auto layout fixes before landscape