merge with joseramonc, uses percentage in forms
changes not_finished scope