Fixed up-button bug in all activities, changed target to android-18