IMG-658 CLean up from feedback session on when to decide layout.