Refactored forms, added autocomplete inputs