ENH added tags, fix submit button