Added markup for more form types