notification fix and main activity clean up