Back button now goes to home activity.
Cleanup of code