minor fixes
replace input with button when appropriate