Refactor, fix notification click.