Changed activity for for android 2.x support