Navigation flow added for button clicks
Merge remote-tracking branch 'origin/master'