Added link to setup in menu and made sure there was proper activity lifecycle management.