Improved wallet form markup and fixed small input ids bug