added default tip button and updated flow