Switching activities and Up navigation added