fixed wrong element prefix in proposal form + cleanup