Try to improve activity transitions and exit properly