Added button and activity switch