Changed settings to prevent activity stacking