added macros, changed input html