Fix block grid span naming. Add hide input option to uploader.