Fix - Fast dial style & more minor fixes