Fix global links viewlet
Refactor the booking form implemntation