Reworked TourPoint-forms