Future major features

Simplify activity chooser