integrated callibration page into flow
fixed counter issue