Pre demo commit with button enable/disable along with short route