Use a proper form so pressing Enter works + UI enhancements