Moved form elements out of base