Use activity.finish() instead of intent