App that is initially displayed is now removed after something else is added.

Other small improvements.