Fixed handling of helpers upload and cleaned up html