Fixed short tags and form