One activity - android changes
closes #208