bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Merge pull request #1222 from D-storm/bug-4415

Bugfix 4415,4453,4452,4451;  RFE-1518 (Navigate away) improvements