Moving path to last token in DNS discovery.
Added custom toolbar.
Merge remote-tracking branch 'origin/master'