Fix : dont destroy the activity when pressing back
Corrected warnings
code cleanup