[#300] Tweaks to the form macros as <input> tags require 'type=text' for the new bootstrap