code readability
added activity context injection and navigator