Pre demo commit with button enable/disable along with short route
Merge remote-tracking branch 'valeed/master'
mileston1 complete