moved list button code and added parent activity
fixed conflict