#841 #842 Fix submit button and rename