Add bubble location refinement and start new forms